Fix passing nil q param value