Revert "Revert "Revert "Changed the query"""

This reverts commit 25ab4f96e936b0b869ca4c6f86db65b433ddd021.
Revert "Revert "Changed the query""

This reverts commit b6db6b8cb8044b35cbebd7d7ac87b641b872f197.
Revert "Changed the query"

This reverts commit f6e19c09f431b3d8f79fc4b42dfd88c421b079f0.