Added search
Merged edit and search