Added filtering
Fixed install