case 3510 - Fix some broken fields.
Merge branch 'case-3510' into new-search

* case-3510:
  case 3510 - Fix some broken fields.