Refactor search annonces