improve Composite/KeySearcher delete behaviour