Bugfix

Lots of changes, detailed in each pull request
if (!StringUtils.isEmpty(action)) {} on line 59