Added back search by id on Context