Bugfix units/gridview