Fixed image inclusion

Tags were always being included by accident, now tags are included only
if the user selects the include image-of-type check boxes.