Search Refactor and Improvements

- Replaced regex strings with RegExp