Made contextification string-aware