plan and tender form fixes