* Fix TypeError when users have tags named the same as droplets * Updated code based on review comments