Fixes #19 - very slow loads of results in web app