Fixed and improved cycle search space