updated queries to match new cols