Use new complex_find method.

Updated usages of complex find.

Updated complex find to work correctly (I think?)