Fix titles in advance configuration

Change-Id: I204d1419d5cc41e977cf6308c4132a9c7ac5d94b
Merge "Fix titles in advance configuration"