Non set fields now return null instead of an empty string.

Agency and Stop refactoring.