add query to prevent map query to perform