Added post count handling