fixed var declarations and small map error handling; filter only visible attribs; systembedingt -> Listing
Merge branch 'new-map' into next