Updated tagging code

- Chose a new compromise with tagging (small speed improvement)
- Added better error handling for querying the EH API