Changed defaultAction and filter action parameter to use the raw action parameter with dashes or underscores instead of striping them out first.