[Queue-2.0] Feedback improvements

  • cherry pick feedback improvements Q1
  • fix pagination
Edited by Chris Lemaire