added query-base and solr-query