APD-111: Create specific bundles for every page
APD-111: wrong aggregation for institutionmap fixed