better handling for viewed stuff