#694 Images gallery fixes, when image is null: created queryOver instead of repository