Changed how deletions are handled

* Also made fixes to HPwSomeV query
* Also added property labels