Swap order of 2007 and 2012 rows

Test #309