Optimised Queries

@nadeeshaan Please provide us a testing Instructions or steps for your several commits.
Please add a blank line here. So, it looks nice and separated from above and not mix with the above.