Only filter GIDable objects; remove cosmetic changes