Improved position filtering
live test revealed a problem
live test revealed a problem #2