The templates now make use of a yet unreleased framework for query generation