Fix on subject search