Fix for searching for builders and repositories