updated hash templates (removed obsolete ${})