Merge "don't use hidden constants (to refer Downloads table columns)"