Bug fix to allow ? character in forms