Merge OAI query into SOLR query, add nouid