Support for extra columns in count query
Fix for appengine LHN search not working
Reenable sorting of LHN results
Merge pull request #1730 from reciprocity/feature/patch-extra-columns-count

#1718 rebased for patch