issue 1027 1028 clustering fixes

- onAdd override was unecessary and incorrect

#1026
#1027 
#1028