operate on tuple entry which can be converted on the fly to its 'rich' version
remove deprecations
add custom join for conditional joining and prefilling empty side of join