refactor non-n:m join handling to seperate method

Mick Hansen
2015-07-21T14:00:40+02:00

fix and reduce code