cleanup
fixed filtering