ME: refactored 'retrieve' action
ME: fixed failing tests by refactoring