Fixed rename function
Add search function