Fix handler edit entity