Convert back to short tags

Convert previous youtube commit back to short tags