Misc tweaks to template in ForRapidDbic helper