minor changes on decomposer
Limit PushDown optimization