Fixed issue with returning all tags