Abstract: Broadcast configuration data such as service information, program specific information and electronic service guide data may be misconfigured in non-standard or misconfigured broadcast networks. A network and data analysis server may be used to monitor network broadcasts for configuration information, check whether the configuration information is valid and transmit updated information to a central service discovery database system. The service discovery database system may be used to repair misconfigured or incomplete configuration information before storing it to a database. Terminals with fast service discovery enabled or that have received misconfigured data through the broadcast network may request configuration data from the service discovery database system. Additionally, terminals and/or network analysis servers may receive broadcast signals through a first network connection while communicating with the database system over a second network connection.