Fix condition for checkbox label update
Replace some parameter to query string conversion