batchuploader: template syntax fix
general: syntax fixes