Improvements in Query Designer