Fix poll tiles if not in instance

This is a fixup of 3b97349dcefb652555aff99ee3cc7a3696af8680 and
0da4579e2e11c3d435d64c0e2473cb9298ebff68.