Added sanitisation to a few fields. Closes # 353.