B-37309: Add Feature Advanced Search
Refactoring to prevent sql injection
Merge pull request #237 from mattkovacs/master

B-37309: Add Feature Advanced Search