Adding more queries
Code cleanup