More cleanups and testing and views.
Tidyup up empty descriptions with a default filter.
Merge more views