Fix for filters on fields that may contain numeric values