Changed query to make it more efficient
2 files changed