Server/Core: fix missing bundle error

Bundles could be converted into Independent tags, so we need to check
Bundle and Independent elements in the generated structure to find
all requested bundles.