fixed sort
played with search