js cleanup
fixed boolean field macro