Update search and add utility helpers for margins and others