added in templates
fixed 404 handling