Fix rest calls issue between running production and dev server