Leaving match in swap mode toggles fields correctly.