move service lines and fix double "on post-fs-data" section