[Moose-dev] finder improvements