Added safe guards for when there are zero query objects on cell configuration