Fixed cross-DB code for WMCList