Fixed tab generation to use urls