19453 - Advanced Search Fixes

Fixed error when searching by CustomerType and added "includeNull" to expired query.