add and remove now works better (no duplicates and no nulls after removing and again adding the same value)