Fixed edge case issues with quickreturn views