Fix issue with defaulting to the base resource when not otherwise specified