Fixes getview by creating two fields .. this needs a review
Merge branch 'fix/getview'

* fix/getview:
  Fixes getview by creating two fields .. this needs a review