Better way to check on multi selectable, and some fixes