Change "replace_and_find_by_default" default to true