Merge pull request #156 from maniac103/for-upstream

More fixes
Fix repository list filtering.