Fixed several issues in the map form input

Change-Id: I1845c7bc85d83792451e57621607a0ce4b36dbcc