fix iterator + links and q