Merge "Redefine query columns in provider"