Bug/solrsearch cyclic dependency

Fixed cyclic dependency for solr classes.