Remove call to handler as per review
Fix CSRF regular expressions as per review