fixed spinner not keeping last choice and added search for subsets as well