Refactor search decorator's collection handling