Temp put view all logic back until complete fix in place.