Fix for colation problem in SQL - Fix for dialog problem (removed popup class)