Fix entrypoints
Merge pull request #180 from zf-fr/fix-capture

Fix entrypoints
Properly filter by id