solved n+1 requests problem - close #21