3.0 custom finders

Unifies it - see other core behaviors.