Make template fix multi-site compatible, fix short tags