Major : search feature added …
some small clean up of code