Topfield detection changes