Refactored and added search terms