B-37309: Add Feature Advanced Search