Minor fixes.
Don't select imageCell if no cell image available.