fix #31: add retries to backfill, fix problem with retries in normal scan