Replacing hard-coded JOIN with new modifier::join() method
Fixing bugs