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