   Session.get 'currentSearchQueryCountPeople'
 
 Template.noResults.noResults = ->
-  Session.get('currentSearchQueryReady') and not Session.get('currentSearchQueryCountPublications') and not Session.get('currentSearchQueryCountPeople')
+  Session.get('currentSearchQueryReady') and not currentSearchQueryCount()
 
 Template.resultsLoad.loading = ->
   Session.get('currentSearchQueryLoading')
 
 Template.resultsLoad.more = ->
-  Session.get('currentSearchQueryReady') and Session.get('currentSearchLimit') < (Session.get('currentSearchQueryCountPublications') or Session.get('currentSearchQueryCountPeople') or 0)
+  Session.get('currentSearchQueryReady') and Session.get('currentSearchLimit') < currentSearchQueryCount()
 
 Template.resultsLoad.events =
   'click .load-more': (e, template) ->

searchLimitIncreasing = false

Deps.autorun ->
  # Every time search query is changed, we reset counts

  $(window).off 'scroll.results'

increaseSearchLimit = (pageSize) ->
  if searchLimitIncreasing
    return
  if Session.get('currentSearchLimit') < currentSearchQueryCount()
    searchLimitIncreasing = true
    Session.set 'currentSearchLimit', (Session.get('currentSearchLimit') or 0) + pageSize

