Merge branch 'query_optimization' into development

src/libs/convert/admDependency.js

src/libs/convert/ethnicGroup.js

src/libs/convert/gender.js

src/libs/convert/location.js

src/libs/convert/period.js

src/libs/convert/schoolYear.js

src/libs/middlewares/id2str.js

src/libs/routes/enrollment.js

src/test/enrollment.js