Fix Notes and term itemId bug