Fixed bindings to toggle between type and 'And' for steps