align form terms with ODK; fix updateapp for serverId and nested lists