r11148: fix limit / filter, improve udoc support