added a query per object fallback combined with better error output