Improoved single entity flush