TAA-17: Expanded URI matcher and tests to resolve all necessary database actions.