change domain query to work with new mapping