Minor updates

Bugfix: CodeCompletion - column names correctly replacet when TAB is
pressed
Minor refactoring