Restored list joins
Merge pull request #227 from nhr/ha_fixes

Restored list joins