Improve perfomance of changelists (#421)