Adding url signals + templatesignal call correction