Reflect changes for new functionality

Added additional search terms, added where/and/or for searching data