fixed some bugs about borrows listing and borrow declaration