fixed calc/prop rule fields filling handling