- Search function created
- Some fixs
- Merge