Added body filtering