Tracking fetching by id

@laurynas  Could you please correct indentation?