finish email and search and add category management