refactoring, search functionality
readmne update