Fix error when unlistening to object that never issued request.
Finish add/remove UI for two queries.