Added keyword lookup of all keywords including by prefixes and suffixes.