Aligned Search form to new Search url structure

Enabled Search on Enter
Aligned naming
little cleanup