Bug Fix: Find and replace was not functioning properly.