Fix get entry by id issue