Choice filterInput should force the filter_placeholder by defualt
Merge branch 'refs/heads/3.0/develop' into AIWS/production