move all ext workarounds here and add combo clear filter override