fix #1 - update `compile-query-step` for :optional & :union, remove `query-step`