Reshuffle order of to_solr override function