Move search to header+Fix dimension links in ep