Search now passes order and edit variables too