While at it, rename option lookup functions to make names clearer, per discussion with Tom.
Attach a file by drag & drop or click to upload
