Switching to regex for searches