improving map dialog and query