Simplify the sql used to search for items
Improvements to freight calculations