hot wednesday
Merge 2 revisions
Fixes Registry Controller + mix-ins to Suggest Search and Suggest UI