#561 - Change logic for Layer can reference itself as its WfsLayer