More staff to be allowed back at Singapore workplaces from 5 April