Improve NINCD detection

- Update timeout handling
- Improve pharmacode detection