Rework interface searching