Change handling of simple vs preflight request