Resolved add/remove issues, implmented preloading + cypher query filter