ENGINE-713: Query parameters refactor

Started from "keepIp" parameter.