[HK] Rafactor to make source of IRRDB info more obvious