progress on queryObject remodeling