Fix incremental discovery logic