Tracking fetching by id

@laurynas another developer simply brake the indentation :disappointed:  Could you fix it in your PR or you want to open another one?