property name fixes based on observed results

Two small changes based on my testing - both related to more specific "tag" property names in the json results I'm getting back