#532 - working on simple options catalog logic