Update templates and fix urls regex errors to match slugs with -