UHM-1204 fixing status display on upcoming tables