OR-410 Add additional search criteria
Merge pull request #6 from sheliu/master

committing additional search criteria changes