better handling of percentage signs