fix matching for capital letters
add regex to match whole words
Merge branch 'newfirms' of github.com:glg/insite into newfirms
simplified matching