Fixed general tab assign/unassign logic