Refactored to dynamicly add content to search