Fixed Find/Replace bugs