Updates and bug fix

Searches now handle hyphens better; updated strings