restore performance improvements

@czue @twymer @dannyroberts 
Unnecessary to do a count since we're going to evaluate the query