Further fixes to javascript selectors