Added the ability to generate a calendar from a query builder string from a new built in service