improve Queries
Merge pull request #45 from Dhilan007/master

improve Queries