feature/932_no_count on theme