switch to more reliable source of mapping information