fixes in views logic