fix URL escape logic
fix variable check