Fix find/replace issues