Refactoring + daterange + multiterm
Search badges in progress