Updated FormController and CORS filter