improves query param value handling;