Add before_where and before_order_by in Query options
Add before_where and before_order_by in Query options
Fix in before_where
Fix in before_where
Improve before_where and before_order_by
Fix in before_where and before_order_by