more work on search & results

#400