Improve SearchA2DMatrix