Organized imports
Simplified th:errors result by using a Macro node
Made nodes introduced by th:errors non-processable