NORJIRA: incremental improvements to solr datasource stuff