Added QueryFriend and adjusted Add/Remove accordingly