Merge CM
Search fixes
Display stuff
Fix