perfomance unfix; views fix