Replaced selector where clauses with the viewer where clauses for list API calls