Remove invalid call to construct_query_for_pids. Reduced total number of Solr queries. Fixes #418