More filtering for API

Fixes #141