Refactor CORSFilter to only add Access-Control Header fiels if request
is OPTIONS