Features/static table and view count

Yea, this issue hasn't been fixed. Fix it before we can merge. Thanks :)