Make "and" the default operator instead of "or"
Added Search By All, updated spec files for readability
Refactored shipments spec file