Bugfix domain swapped with replacement screen when adding new items