Incorporate review changes

- Guarantee repository order during search
- Use properties for repository name etc.