Enhance search result and form (not finished)