Keep position in HListView after dialog change;
Clean up code