SELECT PUN.UN_NUMBER , PUN.DESCRIPTION , POH.HAZARD_CLASS , PUN.HAZARD_CLASS_ID , PUN.UN_NUMBER_ID FROM PO_UN_NUMBERS PUN , PO_HAZARD_CLASSES POH WHERE SYSDATE < NVL(PUN.INACTIVE_DATE , SYSDATE +1) AND PUN.HAZARD_CLASS_ID IS NOT NULL AND PUN.HAZARD_CLASS_ID = POH.HAZARD_CLASS_ID UNION SELECT PUN.UN_NUMBER , PUN.DESCRIPTION , NULL , PUN.HAZARD_CLASS_ID , PUN.UN_NUMBER_ID FROM PO_UN_NUMBERS PUN WHERE PUN.HAZARD_CLASS_ID IS NULL AND SYSDATE < NVL(PUN.INACTIVE_DATE , SYSDATE +1)