Refactor Code
Fix Search