Fixed template tags and friends app include from tags