better filter out cross-type entries ...