fix bucket expressions