Modified registration and search (work field deleted)