Fix maps/ and auth return back now