MDL-38854 Keep search text boxes within blocks