Replace count => size
Fix note view