Fix queue list for D8.