Fix addition of selectable fields to From to be generalised