Category dropdown (bugs 860402, 858701)