Defect #FW-8,#FW-9 Fixes Changing the Base API URL