Fix number removal that was making some senses unparseable and added atrribute finding