fix search + change context menu infrastructure