NXP-15310: improve default search layout