removed containsFbId, fixed updatePending