switch to filter for object removal
fix collection update