Changes for yes/no to view querying