Find more strings, fix duplicated replacement string detection