Pool and fountain tags, ETA?

Hi everyone

Since the cottage update broke our pool and fountain tags, is there an ETA to implement the new tags?

I have had to re-tag all my pool and fountain CC into my misc electronics so I can view them. 

I am looking forward to being able to tag under the new list, can someone please advise if this will be available in the near future?

Thanks so much