Maps/form fix on FS3