Fix possible null reference when query is cancelled & Add new image icon for images whose formats are not support & Other improvements

Fix possible null reference when query is cancelled & Add new image icon for images whose formats are not support & Other improvements #3154