GUI-1332
fixes to avoid injection issues