Rewrite the method for collecting elements with criteria

The method is now rewritten and tested. So bugs should not occur in this case. More tests could be useful, but this is the minimum that is required.

Breaking out this commit from the MR !5 (closed)