Added a question mark for null image entities. Fixed diverse bugs.