Fix some bugs in views 5 14am 22613 -ian