Updates to dqpairs and entry-combinations