Added better track by expressions to prevent duplicate collisions, see issue #5