Minor js cleanup, improve some filters