Improved search spec to handle case of date constraint