Dok/feature/fixes sidebar empty array return