Sorting resultset

In query tab resultset , if you click column header it sorts (obviously sorting is done clent side). If there is like zilion records heidi hangs with progress icon and can't be canceled, so you have to wait.

Optimization of sort algorithm + cancel sorting option, please.

Waiting now for 2 minutes + ...... for 150.000 records.