Category dropdown WiP (bugs 860402, 858701)