wat
Add SearchLoader, more small edits for 7.1