Fixing problems in MgrSercviceQuery (Test & Impl)