Recently Update Macro - Spaces parameter to supprt @self, @all

It would be helpful if the recently updated macro supported the ability to utilize @self and @all in the spaces parameter. This would be similar to the parameters for Content by label macro. That being said, it might be useful to have the parameter be the same name "key".