data navigation improvements