filter-form redesign; code cleanup in PopupStreamSelect and LabelSelect