Added more responsive search