CMS-2952 Replace all usage of FindContentRequest with ContentQueryRequest

Removing unused resources
CMS-2989 Fix coordination between aggregation-groups

Changed behaviour to consider the last selected aggregation group instead of the first, and also keep the selected buckets from previous groups between the selects