Added %NULL% for empty values