reenable catalogue and make every test pass, fix search