added filtering to users