Entityid & discovery service fix

Until entityid is specified in config/config.php, there's an error at
the main page. Also, fix for CESNET's discovery service (including
filter) has been added.