Added Search and LocalStorage bug fix