Made search less hack