Fix sorting by id column in column context menu, clear up