Added ability to search and organize the queue