Fix boolean processing, avoid duplicate clicks