fixed filtering
fb