AaronM - Hide empty choices