Convert WatchedItemQueryService to using getConnectionRef()