layout.tag enhancements

Change-Id: Iffd0f7e5f21e4043264a7305a725937e391ad589