added entity converter
fixed document picker