Some fixes for SearchExpression widget