CLC-4230 - Include SID in Saved/Recent blocks + Refactor