Removed the stupid ontological queries and just kept the optimized one