u/IceReasonable4002

Hello all! We have the vac in the pics attached, my partner washed the filter in it with warm water and consequently it is now a bit misshapen and needs replacing, however when I google the model I get 2 different filters.
Ours was bought second hand and only had the square filter from the first pic in it.
Question is, which one is correct now? Have they changed the filter to the conical one, given I can't see the square one on the Ryobi site, only on unboxing vids/ebay etc? Is it both? Were we missing one to start with? Happy to buy both but genuinely mystified on this one. Any help would be appreciated!