Pop up improvements

Pop up can now handle standard field names and values.