Bug 885384 - total results toggle + other fixes