Adding where clauses for shipping tier calculation