Content will now report the correct comment_count
All that hard work and we still ended up with modal dialogs... darn...