Added !empty check for quantity label