Change address sorting field to be correct