Added Mustache templating in query