WCM-185 Fix the reload problems of the bundle and use a finer approach w...

...hen the filter chain is created so we don't include all the filters in the chain