Fix some resource filtering issues