Fix: Marks touching form elements not detected
Tweak word removal conditions