WORLDS-1: fix stale cursor issues