Cleaned up Queries table
Merge https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation