Change option name to completeOnSingleClick, and reduce amount of changed code