VEDMAK fixes
Fix SQL injection in generator
VEDMAK changes