Fix handlers for image listing