major entity disambiguation fixes