decorator update and template tags update