Some changes on files search