Major refactor on queries for npcs and merchants, new query allows for sorting and filtering on the zones column