Merge "db search logic/unit test now works as expected"