Added query limiting to see if this fixes it