fix 2

more regex and removal of null items