new filtering data prompts
Merge branch 'release/version_2'