fix add/remove to observable collections