Test new query
Optimise
Merge pull request #169 from dreamteam69/master

Test new query and optimise code