Fix: Panic for single object is not included in final result and bulk queries

Merged Akshay Bharambe requested to merge ab_Fix_PanicForSingleObject into devbranch