Now really use internal city value when fetching data for partner table (#403)