bugfixing queries for deletion. A few are still wrong. Committing to try to figure out how to get Theeban's changes.
Merge branch 'andes_dev' of github.com:IntersectAustralia/faims-android into andes_dev