refactor q params