Fix enter on automcomplete and changed validation order