add agency and fix bug data source