Reduce number of API queries made after initial query

Issue #25 resolved
Alec Douglas repo owner created an issue

No description provided.