Add query to Map capabilities