improvement on annotation navigating