improve guests fields on search fomr