Ok, I'll remove the associated field checking, and make whitelisting part of the settings data. This means we won't need additional code in the Query class as well :smile:. I'll be sure to include these kind of changes in the related docs changes.