fix and improve pagination
remove 6or30 filter and add 1year filter