Improve key detect, apply to other forms