improve location form