modularize searches