Added hypem fetch id plus various fixes