diff --git a/_data/gallery/2017-03-24-london.yml b/_data/gallery/2017-03-24-london.yml
index ea3c685..459c6de 100644
--- a/_data/gallery/2017-03-24-london.yml
+++ b/_data/gallery/2017-03-24-london.yml
@@ -1,46 +1,13 @@
 title: London
 date: 2017-03-24
 end_date: 2017-03-27
-highlight: 71c27fe
 photos:
-  e3170cd:
-    aperture: f/2.8
-    date: 2017-03-24 14:30:06
-    exposure: 1/80
-    file: DSCF3546
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  17b1e67:
-    aperture: f/4.2
-    date: 2017-03-24 15:59:06
-    exposure: 1/220
-    file: DSCF3547
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  a886a8d:
-    aperture: f/1.8
-    date: 2017-03-24 16:40:58
-    exposure: 1/45
-    file: DSCF3549
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
   84ab35d:
     aperture: f/1.8
     date: 2017-03-24 21:02:53
     exposure: 1/13
     file: DSCF3550
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  2f5b482:
-    aperture: f/1.8
-    date: 2017-03-24 21:03:07
-    exposure: 1/15
-    file: DSCF3552
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   f58db0e:
@@ -48,7 +15,7 @@ photos:
     date: 2017-03-24 21:43:07
     exposure: 8/10
     file: DSCF3555
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   2c6bd68:
@@ -56,15 +23,7 @@ photos:
     date: 2017-03-24 21:44:14
     exposure: 1/3
     file: DSCF3556
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  1af14b6:
-    aperture: f/3.4
-    date: 2017-03-24 21:49:20
-    exposure: 8/10
-    file: DSCF3557
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   3ae4b46:
@@ -72,23 +31,7 @@ photos:
     date: 2017-03-24 21:50:45
     exposure: 1/3
     file: DSCF3558
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  29466a9:
-    aperture: f/4.9
-    date: 2017-03-24 21:54:40
-    exposure: 18/10
-    file: DSCF3559
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  c19e511:
-    aperture: f/4.5
-    date: 2017-03-24 21:56:56
-    exposure: 16/10
-    file: DSCF3560
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   c65212a:
@@ -96,7 +39,7 @@ photos:
     date: 2017-03-24 21:58:38
     exposure: 8/10
     file: DSCF3561
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   225fd13:
@@ -104,15 +47,7 @@ photos:
     date: 2017-03-24 22:07:01
     exposure: 16/10
     file: DSCF3562
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  12555e0:
-    aperture: f/6.4
-    date: 2017-03-24 22:27:56
-    exposure: 1/4
-    file: DSCF3568
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   dd00a2a:
@@ -120,7 +55,7 @@ photos:
     date: 2017-03-25 11:45:06
     exposure: 1/80
     file: DSCF3569
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   bf6de65:
@@ -128,39 +63,7 @@ photos:
     date: 2017-03-25 11:46:11
     exposure: 1/100
     file: DSCF3572
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  7760898:
-    aperture: f/3.6
-    date: 2017-03-25 12:44:12
-    exposure: 1/250
-    file: DSCF3574
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  6511d27:
-    aperture: f/5.0
-    date: 2017-03-25 13:47:13
-    exposure: 1/900
-    file: DSCF3577
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  7443a28:
-    aperture: f/5.0
-    date: 2017-03-25 14:08:35
-    exposure: 1/800
-    file: DSCF3578
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  68a1627:
-    aperture: f/4.5
-    date: 2017-03-25 14:31:23
-    exposure: 1/800
-    file: DSCF3582
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   e8f6cce:
@@ -168,7 +71,7 @@ photos:
     date: 2017-03-25 14:42:23
     exposure: 1/800
     file: DSCF3584
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   71c27fe:
@@ -176,23 +79,7 @@ photos:
     date: 2017-03-25 14:43:22
     exposure: 1/340
     file: DSCF3587
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  9399909:
-    aperture: f/4.0
-    date: 2017-03-25 14:45:20
-    exposure: 1/680
-    file: DSCF3588
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  e6de06f:
-    aperture: f/4.9
-    date: 2017-03-25 14:53:51
-    exposure: 1/640
-    file: DSCF3590
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   ab98483:
@@ -200,71 +87,7 @@ photos:
     date: 2017-03-25 14:54:10
     exposure: 1/800
     file: DSCF3591
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  161e5ce:
-    aperture: f/5.6
-    date: 2017-03-25 14:54:35
-    exposure: 1/800
-    file: DSCF3592
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  d60e499:
-    aperture: f/4.9
-    date: 2017-03-25 14:55:08
-    exposure: 1/550
-    file: DSCF3593
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  c2dd10a:
-    aperture: f/4.0
-    date: 2017-03-25 15:08:48
-    exposure: 1/450
-    file: DSCF3595
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  88ea351:
-    aperture: f/4.5
-    date: 2017-03-25 15:09:17
-    exposure: 1/800
-    file: DSCF3596
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  b614da4:
-    aperture: f/4.0
-    date: 2017-03-25 15:11:40
-    exposure: 1/850
-    file: DSCF3598
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  8a0e12b:
-    aperture: f/4.9
-    date: 2017-03-25 15:12:36
-    exposure: 1/900
-    file: DSCF3599
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  f751b99:
-    aperture: f/4.0
-    date: 2017-03-25 15:16:05
-    exposure: 1/450
-    file: DSCF3600
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  1fd98f8:
-    aperture: f/4.0
-    date: 2017-03-25 15:18:47
-    exposure: 1/480
-    file: DSCF3602
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   e5fa9b0:
@@ -272,7 +95,7 @@ photos:
     date: 2017-03-25 15:18:57
     exposure: 1/850
     file: DSCF3603
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   7735796:
@@ -280,7 +103,7 @@ photos:
     date: 2017-03-25 15:19:09
     exposure: 1/640
     file: DSCF3604
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   675c1ba:
@@ -288,15 +111,7 @@ photos:
     date: 2017-03-25 15:25:19
     exposure: 1/300
     file: DSCF3605
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  fb7be8e:
-    aperture: f/4.0
-    date: 2017-03-25 15:25:24
-    exposure: 1/350
-    file: DSCF3606
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   bb47be0:
@@ -304,39 +119,7 @@ photos:
     date: 2017-03-25 17:06:23
     exposure: 1/900
     file: DSCF3611
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  1ce488f:
-    aperture: f/3.8
-    date: 2017-03-25 17:07:44
-    exposure: 1/850
-    file: DSCF3612
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  df48046:
-    aperture: f/5.0
-    date: 2017-03-25 17:09:21
-    exposure: 1/800
-    file: DSCF3613
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  6dfa077:
-    aperture: f/5.0
-    date: 2017-03-25 17:59:50
-    exposure: 1/850
-    file: DSCF3614
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  16dc6c2:
-    aperture: f/7.1
-    date: 2017-03-25 18:00:58
-    exposure: 1/1200
-    file: DSCF3615-Pano
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   3139af1:
@@ -344,15 +127,7 @@ photos:
     date: 2017-03-25 19:15:20
     exposure: 1/400
     file: DSCF3633
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  8e8db52:
-    aperture: f/7.1
-    date: 2017-03-25 19:16:51
-    exposure: 1/800
-    file: DSCF3634-Pano
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   1b45040:
@@ -360,15 +135,7 @@ photos:
     date: 2017-03-25 19:17:08
     exposure: 1/300
     file: DSCF3664
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  7cff103:
-    aperture: f/4.0
-    date: 2017-03-25 19:17:21
-    exposure: 1/550
-    file: DSCF3665
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   ad37060:
@@ -376,7 +143,7 @@ photos:
     date: 2017-03-25 19:17:49
     exposure: 1/300
     file: DSCF3666
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   d1a0c7e:
@@ -384,7 +151,7 @@ photos:
     date: 2017-03-25 19:18:45
     exposure: 1/300
     file: DSCF3668
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   15bdfdf:
@@ -392,15 +159,7 @@ photos:
     date: 2017-03-25 19:19:41
     exposure: 1/280
     file: DSCF3670
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  73310bf:
-    aperture: f/4.0
-    date: 2017-03-25 19:20:10
-    exposure: 1/300
-    file: DSCF3671
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   16f81e0:
@@ -408,47 +167,7 @@ photos:
     date: 2017-03-25 19:20:24
     exposure: 1/320
     file: DSCF3672
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  f2a5033:
-    aperture: f/4.0
-    date: 2017-03-25 19:22:30
-    exposure: 1/800
-    file: DSCF3674
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  1cd5b96:
-    aperture: f/4.0
-    date: 2017-03-25 19:22:38
-    exposure: 1/320
-    file: DSCF3676
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  64b3ccf:
-    aperture: f/4.0
-    date: 2017-03-25 19:22:45
-    exposure: 1/550
-    file: DSCF3677
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  eafbcdc:
-    aperture: f/4.0
-    date: 2017-03-25 19:23:08
-    exposure: 1/640
-    file: DSCF3680
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  1d4c7c7:
-    aperture: f/4.0
-    date: 2017-03-25 19:23:46
-    exposure: 1/450
-    file: DSCF3683
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   8dc316f:
@@ -456,31 +175,7 @@ photos:
     date: 2017-03-25 19:24:12
     exposure: 1/600
     file: DSCF3685
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  bc1b969:
-    aperture: f/4.9
-    date: 2017-03-25 19:47:51
-    exposure: 1/280
-    file: DSCF3688
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  358a3a1:
-    aperture: f/2.5
-    date: 2017-03-25 19:54:04
-    exposure: 1/280
-    file: DSCF3689
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  9a65cd8:
-    aperture: f/2.0
-    date: 2017-03-25 19:54:20
-    exposure: 1/300
-    file: DSCF3690
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   66c73e7:
@@ -488,23 +183,7 @@ photos:
     date: 2017-03-25 20:20:14
     exposure: 1/15
     file: DSCF3691
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  69ac5a3:
-    aperture: f/1.8
-    date: 2017-03-25 20:22:30
-    exposure: 1/25
-    file: DSCF3693
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  77dd314:
-    aperture: f/2.5
-    date: 2017-03-25 20:36:44
-    exposure: 1/8
-    file: DSCF3697
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   155072b:
@@ -512,7 +191,7 @@ photos:
     date: 2017-03-25 20:36:56
     exposure: 1/13
     file: DSCF3698
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   a503446:
@@ -520,7 +199,7 @@ photos:
     date: 2017-03-25 20:37:41
     exposure: 1/13
     file: DSCF3701
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   df991e6:
@@ -528,15 +207,7 @@ photos:
     date: 2017-03-26 10:21:59
     exposure: 1/70
     file: DSCF3702
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  ce3a6f3:
-    aperture: f/3.6
-    date: 2017-03-26 10:22:04
-    exposure: 1/15
-    file: DSCF3703
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   9cc2901:
@@ -544,7 +215,7 @@ photos:
     date: 2017-03-26 11:00:32
     exposure: 1/100
     file: DSCF3705
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   fedd415:
@@ -552,7 +223,7 @@ photos:
     date: 2017-03-26 12:00:44
     exposure: 1/35
     file: DSCF3706
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   4754eb0:
@@ -560,15 +231,7 @@ photos:
     date: 2017-03-26 12:01:19
     exposure: 1/30
     file: DSCF3707
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  7b28321:
-    aperture: f/1.8
-    date: 2017-03-26 12:08:49
-    exposure: 1/110
-    file: DSCF3708
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   15c2262:
@@ -576,39 +239,7 @@ photos:
     date: 2017-03-26 13:16:57
     exposure: 1/100
     file: DSCF3710
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  e4d24fd:
-    aperture: f/1.8
-    date: 2017-03-26 13:18:35
-    exposure: 1/100
-    file: DSCF3713
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  e458930:
-    aperture: f/1.8
-    date: 2017-03-26 13:51:29
-    exposure: 1/20
-    file: DSCF3714
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  df24352:
-    aperture: f/1.8
-    date: 2017-03-26 13:51:46
-    exposure: 1/40
-    file: DSCF3715
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  a7e06f4:
-    aperture: f/1.8
-    date: 2017-03-26 13:54:14
-    exposure: 1/5
-    file: DSCF3716
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   3c744cc:
@@ -616,7 +247,7 @@ photos:
     date: 2017-03-26 14:01:40
     exposure: 1/45
     file: DSCF3717
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   212ec19:
@@ -624,15 +255,7 @@ photos:
     date: 2017-03-26 14:23:31
     exposure: 1/15
     file: DSCF3719
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  365f935:
-    aperture: f/4.0
-    date: 2017-03-26 14:30:48
-    exposure: 1/750
-    file: DSCF3720
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   61f8605:
@@ -640,7 +263,7 @@ photos:
     date: 2017-03-26 14:31:10
     exposure: 1/800
     file: DSCF3721
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   e3b680c:
@@ -648,23 +271,7 @@ photos:
     date: 2017-03-26 14:32:20
     exposure: 1/900
     file: DSCF3725
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  2c91387:
-    aperture: f/1.8
-    date: 2017-03-26 14:50:19
-    exposure: 1/15
-    file: DSCF3727
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  ea39d37:
-    aperture: f/1.8
-    date: 2017-03-26 14:50:50
-    exposure: 1/45
-    file: DSCF3728
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   52d056e:
@@ -672,23 +279,7 @@ photos:
     date: 2017-03-26 14:52:45
     exposure: 1/70
     file: DSCF3729
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  cb1044f:
-    aperture: f/2.5
-    date: 2017-03-26 15:12:59
-    exposure: 1/250
-    file: DSCF3730
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  bf1a18c:
-    aperture: f/1.8
-    date: 2017-03-26 15:17:50
-    exposure: 1/70
-    file: DSCF3731
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   8971e2f:
@@ -696,39 +287,7 @@ photos:
     date: 2017-03-26 16:10:56
     exposure: 1/340
     file: DSCF3735
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  8f36017:
-    aperture: f/4.9
-    date: 2017-03-26 16:48:07
-    exposure: 1/680
-    file: DSCF3737
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  fa9659e:
-    aperture: f/4.5
-    date: 2017-03-26 17:08:01
-    exposure: 1/850
-    file: DSCF3738
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  9a2eb76:
-    aperture: f/4.5
-    date: 2017-03-26 17:10:41
-    exposure: 1/800
-    file: DSCF3739
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  69a2b54:
-    aperture: f/4.5
-    date: 2017-03-26 17:11:50
-    exposure: 1/850
-    file: DSCF3740
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   7726030:
@@ -736,7 +295,7 @@ photos:
     date: 2017-03-26 17:11:55
     exposure: 1/850
     file: DSCF3741
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   1486b0b:
@@ -744,15 +303,7 @@ photos:
     date: 2017-03-26 17:12:49
     exposure: 1/800
     file: DSCF3742
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  1faa47e:
-    aperture: f/4.0
-    date: 2017-03-26 17:13:07
-    exposure: 1/750
-    file: DSCF3746
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   48a81d2:
@@ -760,7 +311,7 @@ photos:
     date: 2017-03-26 17:13:50
     exposure: 1/950
     file: DSCF3747
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   5250446:
@@ -768,23 +319,7 @@ photos:
     date: 2017-03-26 17:14:40
     exposure: 1/850
     file: DSCF3750
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  1312bd9:
-    aperture: f/4.0
-    date: 2017-03-26 17:14:55
-    exposure: 1/900
-    file: DSCF3751
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  db3228f:
-    aperture: f/4.5
-    date: 2017-03-26 17:30:10
-    exposure: 1/900
-    file: DSCF3752
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   e068428:
@@ -792,15 +327,7 @@ photos:
     date: 2017-03-26 17:30:21
     exposure: 1/750
     file: DSCF3753
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  f0d8089:
-    aperture: f/4.0
-    date: 2017-03-26 17:35:35
-    exposure: 1/640
-    file: DSCF3754
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   2e793ab:
@@ -808,15 +335,7 @@ photos:
     date: 2017-03-26 20:06:48
     exposure: 1/7
     file: DSCF3756
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  78de576:
-    aperture: f/1.8
-    date: 2017-03-26 20:07:10
-    exposure: 1/9
-    file: DSCF3757
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   e4180fc:
@@ -824,23 +343,7 @@ photos:
     date: 2017-03-26 20:07:18
     exposure: 1/9
     file: DSCF3758
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  5190d1b:
-    aperture: f/1.8
-    date: 2017-03-26 20:07:28
-    exposure: 1/8
-    file: DSCF3759
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  13c3a39:
-    aperture: f/4.0
-    date: 2017-03-27 12:09:16
-    exposure: 1/550
-    file: DSCF3760
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   e49a9e3:
@@ -848,7 +351,7 @@ photos:
     date: 2017-03-27 12:09:57
     exposure: 1/550
     file: DSCF3762
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   1849f6b:
@@ -856,7 +359,7 @@ photos:
     date: 2017-03-27 12:17:45
     exposure: 1/250
     file: DSCF3763
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   4d7e31f:
@@ -864,23 +367,7 @@ photos:
     date: 2017-03-27 13:11:19
     exposure: 1/500
     file: DSCF3764
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  ec4a386:
-    aperture: f/4.0
-    date: 2017-03-27 14:42:38
-    exposure: 1/800
-    file: DSCF3765
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  a98c728:
-    aperture: f/5.0
-    date: 2017-03-27 14:45:35
-    exposure: 1/800
-    file: DSCF3766
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   8ded907:
@@ -888,15 +375,7 @@ photos:
     date: 2017-03-27 14:49:35
     exposure: 1/450
     file: DSCF3767
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  bed4643:
-    aperture: f/5.6
-    date: 2017-03-27 15:50:55
-    exposure: 1/900
-    file: DSCF3768
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   b988b34:
@@ -904,23 +383,7 @@ photos:
     date: 2017-03-27 15:53:32
     exposure: 1/250
     file: DSCF3770
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  a626341:
-    aperture: f/10.0
-    date: 2017-03-27 15:57:04
-    exposure: 1/2000
-    file: DSCF3771-Pano
-    make: FUJIFILM
-    model: XQ1
-    width: 1920
-  6db8361:
-    aperture: f/2.2
-    date: 2017-03-27 16:01:17
-    exposure: 1/300
-    file: DSCF3783
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920
   be66732:
@@ -928,6 +391,6 @@ photos:
     date: 2017-03-27 16:05:39
     exposure: 1/800
     file: DSCF3784
-    make: FUJIFILM
+    make: Fujifilm
     model: XQ1
     width: 1920