Refactor to use shared skip columns method for each query type