Update fnid loading