fix drill downs
Merge branch 'master' into new_solr_fields