Add value filtering (Fix #3)