Arrow search fixed