Dialog fixes in Freemap