Continue porting Database_Search