Fix: Handle discarded includes if `attributes: []`
Skip expanding hierarchies if none present