support referencing paths in a choice lists + refactor + test