Added keys to array for easier filtering.
Added "tag" custom field