This is a known issue and I am going to be rectifying it.   I will see if I can create a quick fix on it while waiting for the time to really sit down and revisit the module.   

There are quite a few things that I would like to fix is some of my old stuff, my only issue is time!! LOL