fix delete and findall