Switched handlers to use 'action' keyword instead of one off tags.