Bug fixes on WRetriever + optimisation on Admin