made filters dynamic, started nomenclature shift, started map filtering work