[XLS-508] added fix for missing overrides. any override queries that
result in null are correctly delegated to the underlying.