refactored, consolidated queries
Merge pull request #18 from opentechinstitute/lisa_search

Refactored, consolidated queries