CON-30 | WAM - hub_id fix [3rd try]