service form fixes