Fixes problem of selection and searching.
Merge branch 'master' into toast-ajax-integration