Return user data instead of container, don't break when passing query strings to listing method