Fixed the conditional directive
Better encapsulation of HTML template state