replace usages of q() with h() where appropriate#1786