FIX take care of lazyload behaviour on update
FIX return same instance on Query Where and AndWhere method