Fix fetched template options priorities
Revert "Change fetched template options priorities"

This reverts commit 15c9272394a9d97fe59b1ee3ae85d5cc39eebace.
Merge