Unify queue add/remove from manager and CLI (bug #2125/2123)