More fixes
Page 3 of search.