Minor fixes in AQ engine and UI