Fix handlers for image listing commands