lot of fixes for deals/wishes templates