Refactor searches module