Refactor browse to search