add migration script for entity_filter
fix parameters order
resolve alembic conflict
Merge branch 'entity_filter_next'