Fixed search method issues all done