Really like what I see here, and am happy to merge as is. The extra clarity is great and it now raises some other questions that were hidden before, we can choose to address them later, but I will raise them now.

Is the `true` required? I think it might be because `QUERYABLE` might be a string? Just always seems weird when you see `value == true` as a comparison, worth investigating.