work in progress - ending query object reunification