fix P form suggestion and validation