Updated queries to work with our current database