Fixed issue with searching for numeric values