Use reflector's search fields logis instead of homegrown copy, also handle
numeric fields better