Update code in filter_results method to perform OR search
Complete change to the AND search
Merge branch 'change_to_or_search'

Fix merge conflict