Fixing Add/Edit manual finding