Refactor and fix browser registry issue.