[fix] general fixes for datamap searching