make history works and perf improvement on admin report FMS-290
improve orrdering and selection of admin UI