Correctly handle returning of selected vals for storing