Fix filter when element is window. A couple of format changes introduced by IDE