Logic fixes for SODView
merged