removed flush, fixed search limit