Fixed Filters solution and added SPA support with Spoon