Fixing CORS and Edit/Search