AddTable circular dependency fix and an existing issue in moving from replacement to executor page