Modify the default queries to be valid queries