Old search fixes
Old search