Fixed identifier lookup for APIS & HGV