Improving CORS

For [AGPUSH-192](https://issues.jboss.org/browse/AGPUSH-192) we are improving CORs a bit