Update: Changed to filter out optional fieldset within selected array