a series of template updates
+ added support for favorites
+ fixed order of processing
+ added support to resolve url