ids now filterable
cleanup