Made search indicator more generic