Fix ambiguous queries in MLS datasource