Issues with server folders

So the server folders were a really nice addition but there's a couple of problems that Discord should think about fixing cause it's extremely annoying specially for laptop users (me since I'm back to the laptop during uni).

1. With server folders the keyboard shortcuts to change between servers while it still works, it doesn't scroll the server list anymore (gets stuck in the first folder it finds). This is annoying since, for laptop users, was the only way to scroll the list and rearrange stuff or focus on specific servers of the list.
2. The first issues brings me to the second issue, I found out the first cause I needed to put a server on top of the list back to a folder. Basically, any server that gets an outage issue that is inside a server folder will be out of the folder and on top of the server list when it's recovered from the outage.

While I love Discord this type of issues that show up because of clear lack of testing is really dumb and same applies to the new themes & fonts.

Would be nice to having a fix for this type of stuff since the UI is already not very friendly by not having a scroll for the servers...