added query param check