added search conditions