Feature/ting object view wsod fix