added NA support for ap clustering