Minor UX improvement before implementing pq