improved Search criteria (#164)