Fix #54, we can now filter on URI and label
Fix #56