Fixed issue with empty tags