Added new queries for bad fixes