Added filtering
Close #13