Free-form SQL auto formatting in SQLRPGLE

WDSCi 7.0.0.4 (all updates applied)

From Preferences:

Automatic uppercasing is Custom, Keywords are Uppercase, Identifiers are Lowercase.
Automatic indent is on and set to 3 blanks.
Automatic formatting is on, New line on comma is End of line, New line on AND/OR keywords is After, On Case keyword is on.
Comments are Move to top.

Problem: It doesn't handle the JOIN and ON keywords the way I'd like. Example:

EXEC SQL
INSERT INTO fip020a
SELECT t2.f2cmpy, t1.f2styl, t1.f2clr, t1.f2size, t1.f2back,
t2.f2cust, ' ', 0, 0, 0, 0, 0, 0
FROM fip020r t1 INNER JOIN fip020 t2 ON t1.f2styl = t2.f2styl
AND
t1.f2clr = t2.f2clr AND
t1.f2size = t2.f2size AND
t1.f2back = t2.f2back LEFT EXCEPTION JOIN fip020a t3 ON
t1.f2styl = t3.f2styl AND
t1.f2clr = t3.f2clr AND
t1.f2size = t3.f2size AND
t1.f2back = t3.f2back
WHERE t1.f2cmpy = :wccmpy AND
t1.f2back = :wcback;

What I'd like to see:

EXEC SQL
INSERT INTO fip020a
SELECT t2.f2cmpy, t1.f2styl, t1.f2clr, t1.f2size, t1.f2back,
t2.f2cust, ' ', 0, 0, 0, 0, 0, 0
FROM fip020r t1
INNER JOIN fip020 t2 ON
t1.f2styl = t2.f2styl AND
t1.f2clr = t2.f2clr AND
t1.f2size = t2.f2size AND
t1.f2back = t2.f2back
LEFT EXCEPTION JOIN fip020a t3 ON
t1.f2styl = t3.f2styl AND
t1.f2clr = t3.f2clr AND
t1.f2size = t3.f2size AND
t1.f2back = t3.f2back
WHERE t1.f2cmpy = :wccmpy AND
t1.f2back = :wcback;

Is there any way to get it to do this now, or does it need to go on the 'wish list'?

Thanks!

Dave Shaw
Mohawk Industries