Parse deferred templates non deferred first

Parse deferred templates non deferred first #368