minor fixes and search option added