Refactor resume search