Now searches when pressing enter in searchfields
Merge origin/master