I am experiencing this same issue. Has this been resolved without using custom code? I do not know how to edit the code. Please advise.