Search/sort interaction fixes