[uk] improve rule coverage
[uk] move some rules to grammar-style