Improved query performance via cutting out some 'or' statements.