Minor changes to parsers. Use JOIN instead of LEFT JOIN.
Merge branch 'fix_dynamic'