D-14212 more changes to fix extension filter bundle
Merge pull request #609 from CoderLisa/D-14212_morefixes

D-14212 more changes to fix extension filter bundle