Bring sort values back
Remove legacy search