Fix for namelist expression in for-loop.
Added more default completions