Change onService rule (#640)

Reorder code to match dataField* definition order