Fix stop-word filtering