Continued work on fixing the broken itemsource on the name column.