Updated fap searches