Updating query for new cols