Use human readable column names.

Fix column names in search.

Use human readable column names.
Fix broken tests.