Strategy and Planning hierarchy fix