* Fix double field search