Refactor search default order