Fixed forwarding to correct page after delete/move of templates

Main code rev. 1811