changed regex again, now filters out more things