Minor improvements
fix for correctly encoding html form submissions