name filter tests
shit
minor
merged, added agency and id filters, added test, refactored
merge fixes