Added handling for text and working on the MultipleSelect some more