fix ordering during swap view