Fixed issue with searching on fields