simplify appearance of result listing
Merge branch 'master' into heroku