Refactor ageQuery
Refactor Gender Query
Refactor queries complete
Merge branch 'refactor_queries'