[ticket/22] Pagination is not rewritten anymore
[ticket/22] left overs ..
Merge pull request #23 from dcz/ticket/22

[Ticket/22] Pagination is not rewritten anymore
Fix #22