Fixed Duplicate events and hydration bugs