refactor naming and add header filter