We are going to improve the whole UX for datasources in the near future and will take your comment into account, thanks!