diff --git a/src/device/DeviceOverview.tsx b/src/device/DeviceOverview.tsx
index 87c0c60..0170bde 100644
--- a/src/device/DeviceOverview.tsx
+++ b/src/device/DeviceOverview.tsx
@@ -233,7 +233,7 @@ export default function DeviceOverview(props: Props) {
             <StatusChip status="pending" />
           </Grid>
         )}
-        {user.allowedTo("provision") && <DeviceTags device={device} disableAdd={disableAddTag} />}
+        {<DeviceTags device={device} disableAdd={disableAddTag} />}
       </Grid>
     );
   };
diff --git a/src/device/DeviceTags.tsx b/src/device/DeviceTags.tsx
index 82981d1..7806a59 100644
--- a/src/device/DeviceTags.tsx
+++ b/src/device/DeviceTags.tsx
@@ -68,6 +68,7 @@ function AddDeviceTag(props: AddDeviceTagProps) {
         <TagUI tag={tag} onClick={() => addTagToDevice(tag)} />
       </ListItem>
     ));
+    
   return (
     <React.Fragment>
       <IconButton aria-label="add tag" onClick={() => setOpen(true)} size="small">
diff --git a/src/providers/pond/deviceAPI.tsx b/src/providers/pond/deviceAPI.tsx
index 27ea776..6a940e2 100644
--- a/src/providers/pond/deviceAPI.tsx
+++ b/src/providers/pond/deviceAPI.tsx
@@ -8,6 +8,7 @@ import { useGlobalState } from "providers";
 import moment from "moment";
 import { or } from "utils/types";
 import { dateRange } from "providers/http";
+import { getContextKeys, getContextTypes } from "pbHelpers/Context";
 
 export interface IDeviceAPIContext {
   add: (name: string, description: string, backpack: pond.BackpackSettings, otherTeam?: string) => Promise<AxiosResponse<pond.AddDeviceResponse>>;
@@ -725,8 +726,12 @@ export default function DeviceProvider(props: PropsWithChildren<Props>) {
   };
 
   const tag = (id: number, tag: string) => {
+    const keys = getContextKeys()
+    const types = getContextTypes()
+    let url = "/devices/" + id + "/tags/" + tag + "?keys=" + keys + "&types=" + types
+    if (as && !keys.includes(as)) url += "&as=" + as
     return new Promise<AxiosResponse>((resolve, reject) => {
-      put(pondURL("/devices/" + id + "/tags/" + tag), {}).then(resp => {
+      put(pondURL(url), {}).then(resp => {
         return resolve(resp)
       }).catch(err => {
         return reject(err)
diff --git a/src/providers/pond/tagAPI.tsx b/src/providers/pond/tagAPI.tsx
index 235e622..071591b 100644
--- a/src/providers/pond/tagAPI.tsx
+++ b/src/providers/pond/tagAPI.tsx
@@ -33,8 +33,16 @@ export default function TagProvider(props: PropsWithChildren<Props>) {
   const [{ as }] = useGlobalState()
 
   const addTag = (tag: pond.TagSettings) => {
+    let keys = getContextKeys()
+    let types = getContextTypes()
+    let url = "/tags"
+    if (keys.includes(as)) {
+      url += "?keys=" + keys + "&types=" + types
+    } else {
+      url += "?as=" + as + "&keys=" + keys + "&types=" + types
+    }
     return new Promise<AxiosResponse>((resolve, reject) => {
-      post(pondURL("/tags"), tag).then(resp => {
+      post(pondURL(url), tag).then(resp => {
         return resolve(resp)
       }).catch(err => {
         return reject(err)