improve overlay support