Refactoring the collection query to filter on the id field only for the collectin member ids.

The filtering is now performed in the collection as part of the fq field instead of the q field.

Added tests for querying within the collection