Updated link generation, no more bloating the WordPress database!