Enabled CSRF + fix for Count bug