fix pagination + updatable + notification