DATASOLR-37 - add q.op to @Query

fixed issue with collections in StringBasedSolrQuery along the way