Updated forms for add and search client