Improved ACP search