Find/replace logic: proper replace for case-insensitive matches

Find/replace logic: proper replace for case-insensitive matches #3497