BS-2705
Rename search index does not update references
BS-2708
Dependencies in comparison are not updated when refactor