Worked on search fix