Fix estate types handling on main form