Code cleanup
Fixed the search
Code cleanup