fix for double fetching
sorting
Merge pull request #32 from BrandyMint/aleksxor/sorting

Aleksxor/sorting