Removed bogus typename keywords.
Quick fix: added legacy code to query areas for regular expressions or has-k.