Add search on resources list
Factorize messages handling