- fix problem with content assist when there are macros & header files - fix small problem which resulted in possible erroneus scanner problems while macro pasting