Adapted to change in navtable api