Add support for more time ranges
Fix paginator rendering issues