refs #204 - Added back the multiple select entities