#182 adding a find before fill in first name