remove reliance on pref for PMS-ip, and improve request handling