merging fixes for tickets above from bugfix branch into master
bumped version to 0.6.4
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the namerequest license (Apache 2.0).
Issue #: /bcgov/entity#6236 /bcgov/entity#6574
Description of changes:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the namerequest license (Apache 2.0).