Merge "Refactor database-related code in ApiQueryWatchlist"