Changing agency table to have compound key. Agencies now show up as before, but filtering is still subtly broken - needs to present this compound key to users.