Rkc hformat

Made some queries simplier