Fixed adding of search field when hitting Enter inside a search field and others

Fixed adding of search field when hitting Enter inside a search field and others.