Finish up fixes for images listing