SSP-2103  additional behavior added so views retain consistencies based on state.