feature #1664: Fix trim and wrong extended template updatey
feature #1664: Add extended template to user resources