Fix _split_query import
Completely remove old layers/maps search implementation