LPS-34532 Applies entity selection pattern to switch popup to dialog
LPS-34532 source formatting