inconsistency fixed between Service model and form

This PR fix issue #18.