Added filter to change total items
Added filters and minor improves