Fixed passing in rows and cols as part of htmlOptions
[OE-3657] General markup fixes