Actually, THIS works, previous commit contains subtle mistake in terms of entity scan (entity resolution that is)