Search mask and final touches