Added support for product collection size with filters
Tidy up and removed stale code