splitting action handler in two, started with unification of action names