Fixed some bugs
Filtering by object_id issue
Usage of the different object_id