More search updates

- Don't add special key chars to search criteria
- Fix: Search hilights big circle