updated condition checks for not available values and updated respective listing values.