I lean towards keeping them separate because "what fields we search by default" and "what fields we allow users to filter by" are two distinct concepts.