MT#5879 Move rows and interval specification from macro.

In macro doesn't work.