Update countertop queries (made some queries slightly harder)