Reduce headers inter-dependency in the QPA plugin