Making Queue selection work in a nicer way.  (Something seems to have broken toggle availability though).