Query param cleanup