Change over to use SearchAPI since it is more flexible and applicable / removing solr views