Fixed a bug where fields were not been picked up and submit label was not appearing correctly