shortened search function signifficantly