Better finding of repos