Use single service call for both JSON and HTML formats
Merge branch 'AP-1371' of https://github.com/maketechnologies/slapshot into AP-1371