#13 : added search conditions