Small fix and clean up.

Add StringUtils.htmlEscape calls back in. 
Remove getting types in a completion request since we don't use them in identifier and property lookups.