More customizable filtering
README fix