rapidftr/tracker#170 @andreweskeclarke @mwangiann Fixing a bug around me...

...rging fields in standard forms