merged added fix for view count