added auto-complete for other window types