fix NPE when querying for related objects
clean up unused method
reorder entries in manifest to fix error