test fixes
all tests pass
Tidy up of javascript code for filtering
Filters filters filters galore
Merge