Refactored AR find to fix #2999

#2999