correct custom finders
more typehints
Merge pull request #1270 from dereuromark/3.0-cf

3.0 custom finder signatures