Optimised slightly
Fixed family not leaving search box