I'm not in love with the name `query_options` -- it's an improvement on `fact_options` I think (since it has ceased being just facts, even before this change).  But not sure what would be better?   Maybe `catalog_options`??  I'm totally open to suggestions.  Naming is hard.