CORS fix
Fixed settings not geting properly returned