Add link to search below queues
Fix merge conflicts