Updates to both API and filtering

[Xkhi]

With these updates the module catches up to the API and adds multiple options for filtering