Improve support of mustaches in tags