Fix Advanced Display

Change-Id: Ia5adaf084ebb5a4739d3b52280f84dd8f0568fe5