Fix A_p, B_p fields for HGM searches