Fix converter_remove_next_keyword
Fix converter_remove_overlap behavior