fixed refresh functionality & list ordering