reorganized and sped up econ filters

but have broken some things