Removed duplicate query's to go in queries.py