Fix for cases when parameter name is urlencoded