tidy up the information into a 1-layer key

Change-Id: I7e0f24386421ef3103eb6a39e523f7fc1ab7f1ad