Add configuration parameter for showing agency names, fix implementation of configuration parameter for using agency-and-id.