shifted default matching conditions to be stored in the Disco controller object and also incorporated allowing matching conditions through the Data Facade
fixed typo