More defensive code around the side-by-side issue. Compare with query count. closes #71