Extracted filtering into separate hierarchy