Further stale query optimization