Querymanagerimpl modifications