Prior to second code review
Change type to be part of model
Change type to be part of model
Change type to be part of model
Change type to be part of model
Fast-forward after rebase mess up.
Merge branch 'add-type-to-search'