#345 Fixed selectors used by Javascript