Improved build search conditions