BUGFIX - native query does not store underlying query