merging Update CountryPicturesQueryBuilder.java