Make the assignBrowse implementation cleaner.
Merge pull request #147 from CmdrMoozy/fixes

Make the assignBrowse implementation cleaner.