Fixing issue #208

Just one part of it (the UI part), still may have issues with the query
after an activity is approved (the badge count list stays the same).