Fixed {% include %} problems