fixed issue with search
completed sort feature