Reverted template filter for "use in template" workaround.
Improved
Merge branch 'master' into koprivajakub-editable