HORNETQ-1232 - magic on paging :)
more fixes