BZ-11083 separate controller from template