Add test for facetting and some minor fixes
Fix retry
Add a new facet filters helper