Cleaned up handling of attributeFilter and attributeOldValue props