Update PropertiesUtilTest
Make DatabaseUtil more robust
Add in searchQueryId to the search result model in order to tie the query and results together