search update, tweaks

Signed-off-by: Nicolay Hekkens <nicolay@wednesdayagency.com>