Fix bug when requesting trailPicture with aspect ratio 

Bug occurs if, say, we have a thumbnail > 620 which is not of the aspect ratio we want, and a main image which is. In that case, no image is served. Correct behaviour is to display the main image

Bug due to using `trailPicture` before finding crop with correct aspect ratio