added objectId to query. Still making external query requests.