[DF-616] improvments in add switch entity dialog