Fixed empty tags, fixed js bug