More filtering of unwanted symbols
big fix