Add comments plus ability to search multiple properties for multiple search terms
Reorder methods