Make the same logic for hiccup tags